commit 461b7e985fc06bf5943d1c975bf0ec9fcf7da444
Author: q66 <q66@chimera-linux.org>
Date:   Thu Mar 30 17:44:09 2023 +0000

    clean up tmpfiles manpages

diff --git a/man/rules/meson.build b/man/rules/meson.build
index fff11a8..62c6184 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -1048,10 +1048,7 @@ manpages = [
  ['systemd-timesyncd.service', '8', ['systemd-timesyncd'], 'ENABLE_TIMESYNCD'],
  ['systemd-tmpfiles',
   '8',
-  ['systemd-tmpfiles-clean.service',
-   'systemd-tmpfiles-clean.timer',
-   'systemd-tmpfiles-setup-dev.service',
-   'systemd-tmpfiles-setup.service'],
+  [],
   ''],
  ['systemd-tty-ask-password-agent', '1', [], ''],
  ['systemd-udev-settle.service', '8', [], ''],
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index c2e32f9..bad83e2 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -18,10 +18,6 @@
 
   <refnamediv>
     <refname>systemd-tmpfiles</refname>
-    <refname>systemd-tmpfiles-setup.service</refname>
-    <refname>systemd-tmpfiles-setup-dev.service</refname>
-    <refname>systemd-tmpfiles-clean.service</refname>
-    <refname>systemd-tmpfiles-clean.timer</refname>
     <refpurpose>Creates, deletes and cleans up volatile
     and temporary files and directories</refpurpose>
   </refnamediv>
@@ -32,17 +28,6 @@
       <arg choice="opt" rep="repeat">OPTIONS</arg>
       <arg choice="opt" rep="repeat"><replaceable>CONFIGFILE</replaceable></arg>
     </cmdsynopsis>
-
-    <para>System units:
-<literallayout><filename>systemd-tmpfiles-setup.service</filename>
-<filename>systemd-tmpfiles-setup-dev.service</filename>
-<filename>systemd-tmpfiles-clean.service</filename>
-<filename>systemd-tmpfiles-clean.timer</filename></literallayout></para>
-
-    <para>User units:
-<literallayout><filename>systemd-tmpfiles-setup.service</filename>
-<filename>systemd-tmpfiles-clean.service</filename>
-<filename>systemd-tmpfiles-clean.timer</filename></literallayout></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -63,13 +48,10 @@
     <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> are
     searched for a matching file and the file found that has the highest priority is executed.</para>
 
-    <para>System services (<filename>systemd-tmpfiles-setup.service</filename>,
-    <filename>systemd-tmpfiles-setup-dev.service</filename>,
-    <filename>systemd-tmpfiles-clean.service</filename>) invoke <command>systemd-tmpfiles</command> to create
+    <para>System services invoke <command>systemd-tmpfiles</command> to create
     system files and to perform system wide cleanup. Those services read administrator-controlled
     configuration files in <filename>tmpfiles.d/</filename> directories. User services
-    (<filename>systemd-tmpfiles-setup.service</filename>,
-    <filename>systemd-tmpfiles-clean.service</filename>) also invoke <command>systemd-tmpfiles</command>, but
+    also invoke <command>systemd-tmpfiles</command>, but
     it reads a separate set of files, which includes user-controlled files under
     <filename>~/.config/user-tmpfiles.d/</filename> and <filename>~/.local/share/user-tmpfiles.d/</filename>,
     and administrator-controlled files under <filename>/usr/share/user-tmpfiles.d/</filename>. Users may use
@@ -79,11 +61,10 @@
     affect files created by the user instance if they are placed in <filename>/tmp/</filename>, even if the
     user instance's time-based cleanup is turned off.</para>
 
-    <para>To re-apply settings after configuration has been modified, simply restart
-    <filename>systemd-tmpfiles-clean.service</filename>, which will apply any settings which can be safely
-    executed at runtime. To debug <command>systemd-tmpfiles</command>, it may be useful to invoke it
-    directly from the command line with increased log level (see <varname>$SYSTEMD_LOG_LEVEL</varname>
-    below).</para>
+    <para>To re-apply settings after configuration has been modified, simply restart the cleanup service,
+    which will apply any settings which can be safely executed at runtime. To debug <command>systemd-tmpfiles</command>,
+    it may be useful to invoke it directly from the command line with increased log level
+    (see <varname>$SYSTEMD_LOG_LEVEL</varname> below).</para>
   </refsect1>
 
   <refsect1>
@@ -193,9 +174,7 @@
         but operates on file systems stored in disk images or block devices. The disk image should either
         contain just a file system or a set of file systems within a GPT partition table, following the
         <ulink url="https://uapi-group.org/specifications/specs/discoverable_partitions_specification">Discoverable Partitions
-        Specification</ulink>. For further information on supported disk images, see
-        <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
-        switch of the same name.</para>
+        Specification</ulink>.</para>
 
         <para>Implies <option>-E</option>.</para></listitem>
       </varlistentry>
@@ -230,31 +209,6 @@
     <programlisting>systemd-tmpfiles --remove --create</programlisting>
   </refsect1>
 
-  <refsect1>
-    <title>Credentials</title>
-
-    <para><command>systemd-tmpfiles</command> supports the service credentials logic as implemented by
-    <varname>LoadCredential=</varname>/<varname>SetCredential=</varname> (see
-    <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>1</manvolnum></citerefentry> for
-    details). The following credentials are used when passed in:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><literal>tmpfiles.extra</literal></term>
-
-        <listitem><para> The contents of this credential may contain additional lines to operate on. The
-        credential contents should follow the same format as any other <filename>tmpfiles.d/</filename>
-        drop-in configuration file. If this credential is passed it is processed after all of the drop-in
-        files read from the file system. The lines in the credential can hence augment existing lines of the
-        OS, but not override them.</para></listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>Note that by default the <filename>systemd-tmpfiles-setup.service</filename> unit file (and related
-    unit files) is set up to inherit the <literal>tmpfiles.extra</literal> credential from the service
-    manager.</para>
-  </refsect1>
-
   <refsect1>
     <title>Environment</title>
 
@@ -305,7 +259,6 @@
   <refsect1>
     <title>See Also</title>
     <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
     </para>
   </refsect1>
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 11a6180..4f34ed2 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -90,23 +90,7 @@ A+    /path-or-glob/to/append/acls/recursively -    -    -     -           POSIX
 
     <para><citerefentry><refentrytitle>systemd-tmpfiles</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     uses this configuration to create volatile files and directories during boot and to do periodic cleanup
-    afterwards. See
-    <citerefentry><refentrytitle>systemd-tmpfiles</refentrytitle><manvolnum>8</manvolnum></citerefentry> for
-    the description of <filename>systemd-tmpfiles-setup.service</filename>,
-    <filename>systemd-tmpfiles-clean.service</filename>, and associated units.</para>
-
-    <para>System daemons frequently require private runtime directories below <filename>/run/</filename> to
-    store communication sockets and similar. For these, it is better to use
-    <varname>RuntimeDirectory=</varname> in their unit files (see
-    <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> for
-    details), if the flexibility provided by <filename>tmpfiles.d</filename> is not required. The advantages
-    are that the configuration required by the unit is centralized in one place, and that the lifetime of the
-    directory is tied to the lifetime of the service itself. Similarly, <varname>StateDirectory=</varname>,
-    <varname>CacheDirectory=</varname>, <varname>LogsDirectory=</varname>, and
-    <varname>ConfigurationDirectory=</varname> should be used to create directories under
-    <filename>/var/lib/</filename>, <filename>/var/cache/</filename>, <filename>/var/log/</filename>, and
-    <filename>/etc/</filename>. <filename>tmpfiles.d</filename> should be used for files whose lifetime is
-    independent of any service or requires more complicated configuration.</para>
+    afterwards.</para>
   </refsect1>
 
   <refsect1>
@@ -503,16 +487,6 @@ w- /proc/sys/vm/swappiness - - - - 10</programlisting></para>
       binary data (including newlines and NUL bytes) to files. Note that if this switch is used, the argument
       is not subject to specifier expansion, neither before nor after Base64 decoding.</para>
 
-      <para>If the caret character (<literal>^</literal>) is used, the argument (i.e. 6th) column takes a
-      service credential name to read the argument data from. See <ulink
-      url="https://systemd.io/CREDENTIALS">System and Service Credentials</ulink> for details about the
-      credentials concept. This modifier is only supported on line types that can write file contents,
-      i.e. <varname>f</varname>, <varname>f+</varname>, <varname>w</varname>, <varname>w+</varname>. This is
-      useful for writing arbitrary files with contents sourced from elsewhere, including from VM or container
-      managers further up. If the specified credential is not set for the <command>systemd-tmpfiles</command>
-      service, the line is silently skipped. If <literal>^</literal> and <literal>~</literal> are combined
-      Base64 decoding is applied to the credential contents.</para>
-
       <para>Note that for all line types that result in creation of any kind of file node
       (i.e. <varname>f</varname>/<varname>F</varname>,
       <varname>d</varname>/<varname>D</varname>/<varname>v</varname>/<varname>q</varname>/<varname>Q</varname>,
@@ -828,19 +802,6 @@ e! /var/cache/krb5rcache - - - 0
       will be removed on boot. The directory will not be created.
       </para>
     </example>
-
-    <example>
-      <title>Provision SSH public key access for root user via Credentials in QEMU</title>
-
-      <programlisting>-smbios type=11,value=io.systemd.credential.binary:tmpfiles.extra=$(echo "f~ /root/.ssh/authorized_keys 700 root root - $(ssh-add -L | base64 -w 0)" | base64 -w 0)
-</programlisting>
-
-      <para>By passing this line to QEMU, the public key of the current user will be encoded in
-      base64, added to a tmpfiles.d line that tells systemd-tmpfiles to decode it into
-      <filename>/root/.ssh/authorized_keys</filename>, encode that line itself in base64 and
-      pass it as a Credential that will be picked up by systemd from SMBIOS on boot.
-      </para>
-    </example>
   </refsect1>
 
   <refsect1>
@@ -853,10 +814,7 @@ e! /var/cache/krb5rcache - - - 0
   <refsect1>
     <title>See Also</title>
     <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd-tmpfiles</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-delta</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry project='man-pages'><refentrytitle>attr</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry project='man-pages'><refentrytitle>getfattr</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry project='man-pages'><refentrytitle>setfattr</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
